Merge "Fix sorted list batched callback." into nyc-support-24.1-dev