Merge branches 'version3' and 'temp7' into version3
added multiple reorient, and confirm collect exit conditions to state machine