First set of merges from KitDLL to KitSH