Merge "Introduce concept of work types." into sc-dev