[Backport release_3.40] Add end point marker to label's callout, and format the section as a table

[Backport release_3.40] Add end point marker to label's callout, and format the section as a table #6694