Merge branch 'issue_1136_fix_race_condition_in_JBM' into 'main'

[Issue 1136] Fix for race condition in JBM allocate/free data unit

See merge request !1689