Merge branch 'nickname-nitpicks' into 'master'

Nickname nitpicks

See merge request !1143
1 job for master in 9 minutes and 26 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #3785
test

00:09:26