Merging jdiff changes.