Merge branch 'main' into 1772-replace-shr_o-by-overflow-free-alternatives