Merge "Restrict access to directories" into tm-dev