MULE-8048 - adding code review feedback