Resolves #1979 and ensures that the content from #1861 is included in the repository-published documentation.
