Committing fix for MULE-7566