Cherrypicked cddccb0, 4310, (kinda) passes list-runs