Merge branch 'main' into 1391-basop-sba-spar-dynamic-active-w-is-not-getting-hit-by-stvs