Merge "Fix task snapshots not being taken"