Merge remote-tracking branch 'XTUPLE/4_6_x' into 23853