Merge branch 'main' into 1393-improve-dtx-testing-coverage-in-sba