REL-2055: Use an Option.