MULE-7862 - applying changes after code review