Merge branch '1977_mcedit_type_accuracy'