chore: language selection added again
chore: language selection added again and working
Merge remote-tracking branch 'origin/0.4' into 0.4