Master chef 11.4

Merge java changes done in master-chef-11.4 into master-chef-11.10