#660 Added support for adding template blocks to existing blocks