merge up to fuse_2_6_merge1
8 files changed