Cherrypicked eeb358