MOB-1177

**DO NOT MERGE YET**
I'd vote for leaving it as it is -- the name is quite self-explanatory