Merge branch 'JABAWS_Release_2_5' into develop