Merge remote-tracking branch 'XTUPLE/4_7_x' into 24672