[cdi-dev] New PR for CDI-30