[[ Bug 13026 ]] Bugfix ported to refactor-syntax_unicode