Attempting to fix num_rows, ongoing
Merge origin/master