Merge "Move active task tracking to a repository" into tm-qpr-dev