Merge branch 'sg/core-filemode-doc-typofix' into maint