Merge "Adding public volume mounts for clone user." into main