Merge "Autogenerate tables of contents"