Release/bb development

Let's try this PR again. I've updated my release/bb-development branch with the latest code.