Merge commit 'kblees/kb/unicode-v13~24' into devel