Merge changes from topic "tc_change_20" into tm-dev

* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 43b327596a
  Import translations. DO NOT MERGE ANYWHERE