Merge branch 'diablo-package' into fremantle-package