Merge branch 'JWS-35' into JABAWS_Release_2_0