Merge remote-tracking branch 'ivan/bug/4000_support-non-ascii' into develop