Revised toolbar sample after #9829 changed editor.toolbar format.
Merge branch 't/10010' into major