Merge commit 'upstream/3.3.0'