MULE-7296 - applying code review feedback