Master to java merge