Improves performance of queries that sort on Metric fields without
filtering them.
Merge branch 'release/2.1'