Merge "Fix issue with 404 logs on wait for delete."