MOB-1780

**DO NOT MERGE YET**
Who said I didn't like it? I don't know the guy ;) It wasn't a part of the task but I'll add it. Thanks for a hint! :)