Translation branch merge view fixes.