Merge branch 'JAL-1321_jws2_tooltips' into Release_2_8_Branch