Merge "Fix for test_volume_swap"