Release/bb refaktor

Manual merge of earlier PR