Merge branch 'basop-2575-regression-with-nonbe_fix_issue_2518' into 'main'

[non-BE][split-non-BE] Resolve "regression with NONBE_FIX_ISSUE_2518"

Closes #2575

See merge request !3015