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