Merge topic 'fix-cps-c-features'

344f23bac4 CPS: Fix C features

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11712