MULE-8039 - applying code review changes