Merge branch '2660_mcedit_reset_selection'