Merge branch '2118_mcext_enhancement'