Merge branch 'moe_writing_branch_from_43aa475dcacaa9399770cc5f12b491488f1feb95'