Merge "Fix multi-user and multi-storage with FUSE"