Different fixes regarding variants and collections sorting
Updated test
Merge pull request #721 from franckstauffer/i18n

Different fixes regarding variants and collections sorting