Merge "Ensure list_with_limit tests pass"