MULE-7291 - making changes after code review