Merge 6.6.2 update into refactor-syntax_unicode