Everything up to and including CB commit 5df734b