#16747: fix link to file objects in the glossary.
#16747: merge with 3.2.