Merge branch '2869_mcext_m4a'