More next week work

lowercasedonkeyrequested to merge
lowercasedonkey/fc-pregmod:more-nextWeek-work into pregmod-master

Per @svornost comments on !8365 (merged)

Merge request reports