Merge "Baseline SAM errors" into sc-dev