Merge branch 'jj/doc-markup-hints-in-coding-guidelines' into maint