The original merge into main did not apply the changes. This fixes it. Closes gh-17635
closes gh-16439 Signed-off-by: Daniel Garnier-Moiroux <[email protected]>
Closes gh-13305