Merge "Merge StackBuilder into TaskBuilder"