Adding more indexes based on prod performance
Merge pull request #1381 from danmcp/master

Merged by openshift-bot