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

Merge branch '1796-replace-shl_o-by-overflow-free-alternatives' into 1836-replace-overflow-basop-operators-by-overflow-free-variants-in-lib_com