Merge changes from topic "am-707d9054-0085-4add-8cb5-07f6cb10d135" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 65cfd97b69 skipped: 79dc3a3343
  [automerger skipped] Import translations. DO NOT MERGE skipped: 65cfd97b69
  Import translations. DO NOT MERGE