Merge "search-template change"