Pull c2 into release branch