tweak: import missing changes from upstream kickstarts
tweak: add some missing utils to canvas ks