Safety gate

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

Should fix the root cause of #2479 (closed)

Fixes #2479 (closed)

Merge request reports