[cdi-dev] Updated CDI-30 PR