Merge "Rename Stack to Task related terms (7/n)" into sc-dev