Fixes for DSC-384

Please check and merge.