Manually assign UUID of task before creation to ensure that retrieval is successful.
Merging-in upstream changes.