MULE-8028 - addiing PR feedback