Merge "DPC should not be allowed to grant development permission" into oc-dev