Updated the upgrade-guide
Merge remote-tracking branch 'upstream/filesystem' into filesystem