Merge branch 'ir_templates'