Migrate old changeStateCriteria affinitic refs #5735