[IMP] Adapt the CLA part to be confrom with last Stefan remarks