Merge "Fixing TaskPersisterTest" into oc-dr1-dev