Merge branch 'fix-basop-issue-1585-cut-bs-crash' into 'main'

[non-BE]Fix crash reported in BASOP issue 1585

See merge request !2395