Merge branch 'kbuild/packaging' into kbuild/rc-fixes