knz Merge pull request #12167 from knz/fix-order-by-count …