Comment 21 for bug 1948560

I am reasonably confident that these changes are OK. I tried them with and without the numeric_collation tweak, and with and without partition by first letter. I also tried the content server.