Lps 35397 Remove TemplateContextType