hotfix: restart on mobile
Sync with master