Merged PR 21052: Fix merge from public to internal

- Please add description for changes you are making.
- If there is an issue related to this PR, please add the reference.
This commit is contained in:
Marc Paine 2022-02-06 18:50:08 +00:00
commit 4c30de7899