Merge remote-tracking branch 'origin/main' into 677-add-masa-and-omasa-jbm-self-tests