AI-499 : stick to java.util.Date instead of LocalDate