Feature/1310 better track translation

Closes #1310