Merge "Switch reference time to ZonedDateTime" into pi-dev