Merge commit 'v3.3b2' into diablo-package