SSP-2411 - more work for sqlserver support