Merge "Fix security problem on PermissionMonitor#hasPermission" into oc-dev