AS7-6558 Initial CDI 1.1 integration