#17452 fix merge conflicts