Fix switching to remoteFileSystem
Merge branch 'master' into features/async-parser