Mapyamls updated

Same like #5674 .