Fixes for DSC-384
Merge branch 'dsc-384'
merge with master