Merge branch 'tz/exclude-doc-smallfixes'