Merge "Complete coverage for volume transfers policies"