fix build for sqlserver
Merge branch 'MasterBugFixing'