Merge commit 'diablo-package-3.2-1' into test-branch