fix: preserve current locale using cookies
Merge branch 'master' into dev