#15014790881611 : Replace Guava Optional by Java 8 Optional