Quick fix for safari browser
Merge branch 'development' into staging