BVAL-352 Improve wording related to CDI