Merge "Fix incomplete removal of nested task" into tm-dev