Merge branch 'help-file-spelling-error' into release-3.16

Merge-request: !3964