Merge changes from topic "am-8da5d3f1-21c0-4b80-9cbb-748987f515da" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: faba866b30 skipped: 38e04d8b0a
  [automerger skipped] Import translations. DO NOT MERGE skipped: faba866b30
  Import translations. DO NOT MERGE