Kfsti 668

This is the initial PR  for applying the KC CGB overlay project to KC 6.0. It should obviously be reviewed closely.
Is this just missing the setter? otherwise it looks like this is in compliance.