Merge changes from topic "am-76a20f08-9212-4001-a52b-dd38a93faa9b" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 053b375862 skipped: a7875e6a7d
  [automerger skipped] Import translations. DO NOT MERGE skipped: 053b375862
  Import translations. DO NOT MERGE