Merge branch 'bug/JAL-3810_annotation_ws_stopping_abruptly' into bug/JAL-3809_ws_para...