Merge remote-tracking branch 'origin/main' into tyriar/si_integration_tests