Merge 6.6.2 into refactor-syntax_unicode - fixed error on iOS