Merge "Restrict access to directories" into udc-dev