Merge "Port 'RecordsetCrossZoneTest' to plugin"