Merge branch 'dev'
Merge branch 'dev'
Cleanup
Merge branch 'master' into dev
Add pointer-description in mobile