DSVC-65, DSVC-69, DSVC-70, DSVC-71
Merge remote-tracking branch 'origin/master'