Merge remote-tracking branch 'origin/main' into 470-implement-missing-masa-ext-output-for-jbm-operation