Merge pull request #382 from aethemba/release/bb-refaktor

Release/bb refaktor
tpl fix