Catch up to old task-manager branch, but with newer baseline