[cdi-dev] Final elements for EDR1