ES-108 : fix for inaccurate delivery status on status page
Merge branch 'master' of https://github.com/globeestate11/estate