Merge "Migrate to override_role for volume module (last)"