First WBB 26 commit