BLK-159 Switching insert blocks to base block
Deprecating old insert blocks