Merge commit 'v3.3.1' into try-3.3.1