DSVC-125
Merge remote-tracking branch 'origin/master'
fixing compilation errors