AFAIK, just use Catalyst 8.6 + hotfix and you 'll be just fine