Merge branch 'main' into add-saturation-smoke-test