Branch 'errata-date' - java/code