Merge branch 'bugfix/ascii-alphanumeric-names' into 'develop'