Merge branch 'rs/t1002-do-not-use-sum' into maint