MOB-1530

**DO NOT MERGE YET**
Yep, I was thinking about that as well. I think we can go with this approach.