fixed merge for #3123
add ee jar for merge for #3123