Merge branch '1102-remove-redundant-sba-ext-tests' into 1102-remove-redundant-sba-ext-output-tests