Cherrypicked 900e9, 4f1a, e51e, dbb24, 1624, (kinda) passes list-runs