merge GARY_XTUPLE/23254 into my issue23878