Release/bb refaktor

Manual merge