bbb client prod changes