Merge branch 'dev'

Fix issue with mobile version of chrome