ICU2 added
Merge branch 'icu'