changed to upstream java module due to fixes applied