1.33: more pod changes (#90070,##87658)