Merge commit '1fe17c5f2f6dd288e60f6ce7d04f491a23f53e82' * commit '1fe17c5f2f6dd288e60f6ce7d04f491a23f53e82': [Issue 2165234] Removing nickname clusters: John/Jack and Patrick/Rick.
Merge commit '1fe17c5f2f6dd288e60f6ce7d04f491a23f53e82' * commit '1fe17c5f2f6dd288e60f6ce7d04f491a23f53e82': [Issue 2165234] Removing nickname clusters: John/Jack and Patrick/Rick.