tp-doc-fix: tp.h review comments fixes.
Merge branch 'tp-doc-fix' into stable