Merge "ApiHelp: Make 'toc' parameter work"