jmontoyaa 03b71ba0c8 merge with 1.11.x 7 lat temu
..
block.tpl 03b71ba0c8 merge with 1.11.x 7 lat temu