Only include groupless choice options as groupless choice options.
Merge branch 'feature/configurable-products' into develop