CONTRIB-4497 Add BBB support