Merged CBC-as-an-option changes into development