Merge remote-tracking branch 'upstream/v3.10' into 1929-update_310