Merge "VolumeShaper: Improve restore" into oc-dev