MT#8015 de translation - fix some bugs

(_partly_ cherry picked from commit 135d48e84a2e0e794bebbbdd00654a06da1807cb)