Merge + Translation fix