Merge "Allow subclass of TaskRecord."