Merge branch 'icu_refactor' into yaz4