Merge "Don't resolve permitted.paths"