Merge branch '2148_obj_edit_issue_with_osba' into 'main'

[non-BE][allow regression] Fix obj editing with OSBA

See merge request !2523