safari bug
Merge branch 'dev' into production

* dev:
  safari bug