Merge changes from topic "am-2e7b32c3-6d04-46ba-bfdc-309eff7d76b0" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: b19a62bcf8 skipped: 5883bd3177
  [automerger skipped] Import translations. DO NOT MERGE skipped: b19a62bcf8
  Import translations. DO NOT MERGE