Merge "Migrate to override_role for image module (part 1)"