Customization of #23529