APLANATS-622: koi8-r
Merge remote-tracking branch 'origin/master'