manual cherry pick fix for custom values