Merge branch '4583_mc_ext_ini_fix'