Merge "Move BasePermission to own package"