Manually merge !12355

Pregmodderrequested to merge
Pregmodder/fc-pregmod:pregmod-dev into pregmod-master

Needed a touch of cleanup and to track down the random outlier texts.

Merge request reports