Cherrypicked 5a53