Merge commit 'v3.3' into diablo-package