Customization of #28566