Cherrypicked ccef, passes list-runs