* Fixes name displaying as "Unknown" (cherry picked from commit 45994a177c128dc83ea01b0697377f7b74b5c4ba)