Merge branch 'dlb_sba_vlbr_20ms_optimization' into 'main'

Fix failures for DTX selection testing: Issue#609

See merge request !830