Synced with production (translatable and chosen)
Merge pull request #12 from dragos-dumi/master

Synced with production (translatable and chosen)