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