MULE-7586: Merge from 3.x