MULE-7865 - applying changes after code review