Merge "VolumeShaper: Fixes for updated Cts test" into oc-dev