Merge changes from topic "am-a4f2313d-91d9-4723-8d15-dc7e5aa52970" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: cfd1e141b9 skipped: d9cf1de3e4
  [automerger skipped] Import translations. DO NOT MERGE skipped: cfd1e141b9
  Import translations. DO NOT MERGE