[cdi-dev] PR for CDI-389 resolution