Merge branch 'dlb_fix_1970' into 'main'

[non-BE] [split-non-BE] [allow regression] fix for issue 1970

See merge request !2167