Merge branch 'master' into diablo-package