SF fix

Blankrequested to merge
Blank/fc-pregmod:SF_Tweaking_II into pregmod-master

Closes #705 (closed).

Edited by Blank

Merge request reports