Pull request for CB updates

Yay, 1.7.8?