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