Merge "Fix 'TemplateNotFound' error"