Fix #17334 where NCG did not properly update the CFG.