Issue #5983: merge -x #8851
Issue #5983: merge -x #8804