Sa fixes

Merged Sander August Heggland Schrader requested to merge SA_fixes into main

Merge request reports