[OC-9613] [OC-9450] [OC-9533] Sprint88-merged

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