Merge branch 'rs/no-null-ptr-arith-in-fast-export'