Merge "Third refactor for BasePermission."