Port recent task framework changes