Cherrypicked db55d