Everything up to and including CB commit 7d801a6