MOB-1177

**DO NOT MERGE YET**
Not related, but this should be in config.