fix fix fix
Merge branch 'feature/fix_ie' into develop