Fix merge regression.
Merge branch 'section_labels' into ams