Merge branch '2103_mcext_enhancement'