Merge commit 'diablo-package-3.0rc1-2' into fremantle-package