[cdi-dev] focusing on CDI 494 / PR277