Merge "Refactor Pap code to use Instant from Date"