[1.6.x] Fixed #21708 -- Added some headings to separate unrelated topics.

Thanks ashley at ashleymills.com for the suggestion.

Backport of 270f7e2167 from master