SF fixes - Make a stable base.

Blankrequested to merge
Blank/fc-pregmod:SF_Fix into pregmod-master
Edited by Blank

Merge request reports