MULE-7425: backporting from 3.x