Handle multi-byte strings correctly
Don't expand vertical
Merge branch 'topic'