Fix 17.0rc1 support.