Merge changes from topic "am-99e79364-ab71-4d96-8a34-000c07c66d3e" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: c2a85c8927 skipped: 43bd9fa8b2
  [automerger skipped] Import translations. DO NOT MERGE skipped: c2a85c8927
  Import translations. DO NOT MERGE