[No review required] SAS fixes

Contains SAS fixes reviewed in other PRs, plus live test fixes.