Merge branch '903_revert_the_fix' into 'main'

revert NONBE_FIX_903_OSBA_TO_STEREO

See merge request !1236