Merge "Add enforcement for duplicate permissions"