Merge branch '1888_basop_mr1672' into 'main'

basop porting mr 1672 -- basop branch

See merge request !2034