Merge "TM TaskServiceContext implementation"