Merge branch 'JWS-36' into JABAWS_Release_2_0