f6cb0bd610
The original merge into main did not apply the changes. This fixes it. Closes gh-17635
The original merge into main did not apply the changes. This fixes it. Closes gh-17635