[cdi-dev] Updated PR #291