Merging changes done for DSS 3.2.2 release