Synced with production chosen setting
Merge pull request #16 from dragos-dumi/master

Synced with production chosen setting