Merge branch 'JABAWS_Release_2_0'