[cdi-dev] Feedback on CDI-58 fix needed