Merge pull request #12096 from deannagarcia/cherrypicsk

Cherrypick changes in preparation for 22.1