Fix Java translation.
Merge branch 'clean-up' into intervals