[sr-dev] git:5.3:c1b9bf21: cnxcc: minor changes