[Architecture] bugfixes bourdenas11 review