Merge branch '1977_mcedit_type_accuracy' into 4.8.1-stable