Update for ice4j r471