Imported upstream 3.22.24.20
Cleanup upstream