JAL-2079 fix broken cherry-pick conflict merge