Merge "First pass on the new permission grouping."