Merge "Make detached task trimmable" into sc-dev