Refactor mobile publisher
Merge pull request #4604 from Flaburgan/refactor-mobile-publisher

Refactor mobile publisher