Merging small file into master to tag 2.3.1rc1

This has passed one sweep of regression tests. Need to do one more + 1 round of performance testing then we're ready to tag 2.3.1 final