Dsc 432

This request provides fix for the defects raised in dsc-432 and dsc-433.  The changes has been deployed to snowy:10655