Merge "Correct recent schema changes for MSSQL, Oracle"