Merge changes from topic "am-95ed1a42-c734-497b-9e03-f8de9f42ea61" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 4310d4d905 skipped: ebf64faa28
  [automerger skipped] Import translations. DO NOT MERGE skipped: 4310d4d905
  Import translations. DO NOT MERGE