Merge commit 'upstream/2.10'