MULE-8028 - applying PR changes