Kfsti 668

This is the initial PR  for applying the KC CGB overlay project to KC 6.0. It should obviously be reviewed closely.
I think this still needs to be added back in. It probably wasn't in the overlay because the overlay was originally based on 5.2, not 5.2.1.