issue #20259: third crack at this merge