[cdi-dev] CDI-26 feedback