Merge remote-tracking branch 'origin/main' into 682-add-ext-support-for-omasa-jbm