MOB-1177

**DO NOT MERGE YET**
I'm not sure. We're not re-using those `Strings`. I'll leave it as it is now.