Merge pull request #2 from nitra/dev

Dev 30883_estimate_delivery