refactor: get rid of templateVariablesXService
#9763
Merged
templateVariablesXService
#9763