Bump bb commit and update templates to work with changes in BB