PMO-506 Translations are not properly updated. Here is the result that I merged at local.