Merge branch 'dlb_revert_commit_e6b45e18' into 'main'

revert commit e6b45e18 as it failed selection tests

See merge request !827