Issue #2316749: Support creation of variation sets with multiple option sets