Blocks refactoring

Anton Sudak requested to merge feature/remove-deprications-refactored-blocks into feature/remove-deprications Sep 19, 2019