Everything up to and including CB commit ff4bd62