Big fix: Invalid config
Bug fix: Fixing mismatched method parameters
Merge remote-tracking branch 'origin/template_fixes'
Merge remote-tracking branch 'origin/new_templates'