Merge "Revert Early version of new volume" into oc-dr1-dev