Add missing commit from previous Cherry Pick
One commit was omitted by mistake from !520 (merged), which was a cherry-pick of !504 (merged). This adds that commit to the release branch (already present on the default branch, thus why this is a direct patch to the release rather than a cherry-pick).