[cdi-dev] Last line before EDR review of PR 250