Merge "Conditionally skip volume validation when attaching volume" into rvc-dev