Fixes #7057 - clamp patched with i18n support