AGPUSH-1013 : Java sender update