Merge "[CEC Configuration] Introduce type checking and switch to 'int' where applicable"