Merge "Merge Task and TaskRecord into one class (65/n)"