Kfsti 668

This is the initial PR  for applying the KC CGB overlay project to KC 6.0. It should obviously be reviewed closely.
Just a question, did we remember to mark all the "required" fields here as not null?