Merge branch '1799-replace-l_shr_o-by-overflow-free-alternatives' into 'main'

Resolve "replace L_shr_o by overflow-free alternatives"

Closes #1799

See merge request !1860