The CStringStore removal has caused degraded performance on a few QA test sets (next to improved / neutral performance on many others, so this doesn't warrant reverting). Investigate what causes this and, if possible, fix it.
The affected test sets are:
See also: this QA issue.
Note: no slowdown has been observed locally on MacOS, so this probably needs investigation on Linux or Windows.