Merge remote-tracking branch 'upstream/1.10' into main