Merge branch 'JWS-29' into JABAWS_Release_2_0