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