Merge branch 'basop_fix_1822' into 'main'

[non-BE] fix for issue 1822 [allow regression]

See merge request !1918