Docs to UTF-8
Merge branch 'dev' into ms