CatherineF-dev: Automated cherry pick of #104039 upstream release 1.21

No Results