Sprint88-merged for OC-9613, OC-9450, OC-9533

Merged changes for OC-9613, OC-9450, OC-9533