MT#8015 backport de-translations to 3.3