Merge branch 'x86_pkg_temp' of .git into for-rc