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