Customization of #22862