Fix of MULE-7092