Kfsti 668

This is the initial PR  for applying the KC CGB overlay project to KC 6.0. It should obviously be reviewed closely.
It wasn't in the kc-cgb overlay version so I took it out. We can put it back though.