Merge commit 'upstream/3.10'