Merge branch 'main' into 1365-sba-mono-detector-test-cases-stv-and-ltv-are-missing