Merge commit 'v3.3.0' into upstream