MULE-6889: Merge from 3.x
MULE-6889: Merge from 3.x