Milestone 6

Merge IE fixed into develop