Avoid MSVC warning about comment tags, re #8419
Merge branch 'bugfix/8891_2d_plot_label_issues' into develop