Merge commit 'upstream/3.12'