merge from CDI