Merge "Fixing issue with TaskRecord lookup."