Merge commit 'upstream/4.6.1'