Merge branch 's17-sum-all-taxes'