chore:  settings  working also on language change
Merge remote-tracking branch 'origin/0.4' into 0.4
chore:  settings  working also on language change