Merge commit 'upstream/3.2.2'