Ported to 4.0.0.CR10-SNAPSHOT