Ned/latest translations

Includes #2485 and #2488