Avoid initializing directories in proxies
Merge remote-tracking branch 'upstream/master'