Pull compat into release branch