Merge "Collect task in getOrCreateRootTask" into tm-qpr-dev