Merge branch 'bug/JAL-2080_javaws_slow_291' into develop