FS work + fix

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

Merge request reports