Merge branch 'dlb_issue_1907' into 'main'

[non-be][split-non-be][allow-regression]fix for issue 1907

See merge request !2098