Merge "Fixed permission." into oc-dev