KB breaking changes

Hi Brian, I've rebased the changes. Thanks.