Cherrypicked 451c