Merge branch '668-add-jbm-for-omasa' into 'main'

[non-BE] Resolve "Add JBM for OMASA"

See merge request !902