As you know, these changes are already done in #9643