MDL-30577, fixing cmi.credit, cmi.mode are not evaluated correctly