Merge branch 'bn/config-doc-tt-varnames' into maint