Apply the Java changes in the docker branch.