Merge "Recordset scenario test suite changes"