Merge "Fix state transition verification." into klp-dev