Merge "Revert Early version of new volume"