Merge branch 'fix/nickname-fail' into 'develop'