Merge pull request #7324 from annando/delivery-statistics