Partially working set delivery dates functionality
Fixed merge conflict