IOS fix
IOS and IE fix
Merge branch 'katana' into front-end-performance