Merge branch '2757_mcedit_record_macro_fix'