See #17757 There are behavior changes for this major version upgrade. We need to ensure the upgrade is backward compatible.