Release/bb refaktor

More manual merges