MULE-7538 - adding feedback after code review