[cdi-dev] Any qualms with merging CDI-490?