Merge branch '2863_mcdiff_merge_enhance'