Merge "Prevent having empty task added back into TDA" into sc-dev