JBIDE-14471: Fix timestamps