Merge "Revert^2 "Extract rule for setting up volume tests"" into main