Merge "Minor cleanup of Task" into sc-dev