Merge commit 'diablo-package-3.3b1-1' into fremantle-package