Merge "VolumeShaper: Clean up constructors" into oc-dev