partial clean up of Farsi and Russian
Merge branch 'dev'