VID-1968 Make options containing optional options optional
/CC @garthwebb