Merge "Run additional compat checks for checkapi"