Display group of option values (there may be options with same names in different groups).
Limit choices constants cleanup.
Merge branch 'feature/configurable-products' into develop