Merge "Fix Java related issues"