Cherrypicked 76d6