Merge "Mitigation for mass GC deletion" into main