Merge demon-fuse2.9 branch

Merge FUSE 2.9 feature branch into master.