Merge commit 'upstream/1.8.2'