Merge branch '1796-replace-shl_o-by-overflow-free-alternatives' into 'main'

Resolve "Replace shl_o by overflow free alternatives"

Closes #1796

See merge request !1856