merge to fuse_2_6_merge2
9 files changed