Customization of #28723