Merge remote-tracking branch 'origin/main' into 654-add-omasa-smoke-tests-no-jbm