Merge branch 'gucharmap-files'