Merge pull request #6613 from MrPetovan/task/6238-add-delivery-done