Merge "Workaround double-translate bug"