Legacy IE alert
Merge branch 'dev' into v2.0