Branch 'repo-sync' - java/code