Merge "Fix tocList() breakage in 6fe1f050"