Merge "Fix Elasticsearch template issue"