[IOT-3022] CNC fixes for CTT