Merge branch 'tf/cleanup-builtin-help-headers'