fix for java interface problem
Merge branch 'master' into p700