Merge branch 'fuse_2_9_bugfix'