MULE-8044 - applying PR feedback