closes #16825 - my first commit from across the pond 😄 --------- Co-authored-by: Claude <noreply@anthropic.com>