fix

Merged Jose Luis Zanotti requested to merge 12.0-fix_for_mssql into 12.0-stage

Merge request reports