Merge pull request #7853 from mikeller/fix_sumd_v3