Merge commit 'v3.0' into diablo-package