Merge release/bb-refaktor into master