Added new blocks to templates
(cherry picked from commit f83ffb1)
Fixed blocks after Adding new blocks to templates