Merge "Fix incorrect state transitions"