Merge branch 'JWS-27-jronn' into JABAWS_Release_2_0