Merge branch 'main' into issue_1136_fix_race_condition_in_JBM