Merge commit 'upstream/2.12'