Resolve issue with SQLServer

Fixed bug #1245835

Change-Id: I7096de62ea3c9f70dacc57a4ebab29dbf07b2902
Merge "Resolve issue with SQLServer" into release-0.3