Merge "Fix NPE in FileSystemProvider." into rvc-dev