Merge branch 'jk/doc-the-this' into maint