Merge "[ATMS] Remove some dead code from Task" into tm-qpr-dev