Merge branch 'main' into 1751-replace-shl_ro-by-overflow-free-alternatives