[[ Bugfix 12001 ]] Temporary work-around
Merge remote-tracking branch 'upstream/refactor-syntax_unicode' into refactor-syntax_unicode