[cdi-dev] Resolving CDI-129