catch-up with latest guava