Merge commit 'v3.0rc1' into diablo-package