#660 Updated TemplateBlock domain and affected files