Merge "Update a permission to be role based." into sc-dev