Merge "TOC: Separate columns for tocnumber and toctext"