Merge changes from topic "am-d2edaf8079284e4cb27fcc47cdd92f40" into pi-dev

* changes:
  Merge changes from topic "am-d375c8a9-01d8-44da-9ef2-2e866e457b89" into oc-dev am: e936691bfc am: 1ea636faa9 am: e5eaa05dd9
  [automerger skipped] Import translations. DO NOT MERGE skipped: 439fdb13fc skipped: a98b588532 am: 1221af165e  -s ours am: aa961b929b  -s ours am: 1190c6d633  -s ours