Merge "Add policy to set the organization name"