* * Uses Optional.ofNullable() at the fluent setters to prevent NPE * Fixes issue #17538 * updates samples