[cdi-dev] Please review PR 218