Merge branch 'tz/tech-docs-to-help-fix'