Merge change I7a57637b into eclair

* changes:
  [Issue 2165234] Removing nickname clusters: John/Jack and Patrick/Rick.