Merge branch 'bug/JAL-2080_javaws_slow' into Release_2_9_0b1_Branch