Patch 4

CDI support fix