Manual merge pull request #819 from simoneavossa/MULE-7714