Solve issues #3423 and #5374

You wanted me to put the i18n stuff?