Merge branch 'hotfix/IE_Error' into develop
Merge branch 'develop'

* develop:
IE Error