CON-2102 | Fix IE issues