[cdi-dev] CDI-324