Merge branch 'sn/null-pointer-arith-in-mark-tree-uninteresting' into maint