Try using updated bundle-icu branch