Merge pull request #7589 from annando/delivery-counter