Merge "Bug 35162 - Change in Database api break extension MSSQLBackCompat"