Merge branch 'basop-2471-correction-of-some-overflow-operations' into 'main'

basop-2471-correction-of-some-overflow-operations [non-BE][split-non-BE]

Closes #2471

See merge request !2869