Merge "Use Option.ofNullable instead of Optional.of"