Merge branch 'extras-devel-package'