pulling in KC CGB functionality from overlay project
handling conflicts while pulling main branch