Merge branch 'tz/doc-show-defaults-to-head' into maint