SF-fixes

Blank_Altrequested to merge
Blank_Alt/fc-pregmod:SF-fixes into pregmod-master

Fixes #2804 (closed).
image
Fixes #2803 (closed).
image
Along with some minor touching up.

Merge request reports