Merge branch '1716-handle-nickname-clashes' into 'develop'