values are unicode
Merge branch 'release/4.6'