Rebase of ks.cfg due to upstream changes