Merge "Mend list_cells call"