- Avoid cycle deprecation (#8466)