Kfsti 668

This is the initial PR  for applying the KC CGB overlay project to KC 6.0. It should obviously be reviewed closely.
So I feel like the db changes we do always want. As long as the interface and functionality isn't affected?