[OE-2619] Make diameter optional