EB-7133 Fix java script issue to work in IE and chrome
Merge branch 'prodsupport' into v2.0.14.04