Added default language selection
Merge remote-tracking branch 'origin' into release