Merge commit 'v3.1' into diablo-package