Merge branch 'fixes' into 'pregmod-master'

Fixes, better gating, formatting, rewording

Closes #4075 and #4082

See merge request pregmodfan/fc-pregmod!10866