jave merge from trunk