Merge "Fix state transition verification."