Merger: Tweaks to task tracking
3 files changed