Re: [cdi-dev] Full rewrite for CDI 558 / PR 270