Kfsti 668

This is the initial PR  for applying the KC CGB overlay project to KC 6.0. It should obviously be reviewed closely.
do we need to concern ourselves about mostly empty criteria bring back a large amount of results?