Merge branch 'rs/tag-null-pointer-arith-fix' into maint