sync with upstream
move some items from install ks here
inscrease size