Fix TOC generator
Merge branch 'master' into dev