Merge "Restrict access to directories" into tm-qpr-dev