Add mssql dialect addons of previous merge