Moved CC6 termination condition change to v1