Fixed typo that broke nameplates
Merge remote-tracking branch 'upstream/development'