Merge "Use consistent naming for enforce_scope option"