Merge "Migrate the recordset validation functional test"