Merge "improve getAllTemplatesServiceModelIds query"