Fix the qunit test
Merge branch 'CH-1368' into sprint110