Merge branch 'bugfix/formatter-single-char-nicks' into 'develop'