TOC should list subparts by title unless it's an empty subpart
Merge branch 'toc-subpart' into merge-upstream