Merge changes from topic "am-4edd61495e3945028ea23456f47cf952"

* changes:
  Merge changes from topic "am-9d83a313dd6b47e4984f65202b91ee41" am: 5daca180ad am: 40cbfff82c am: 9e4502a65b
  [automerger skipped] RESTRICT AUTOMERGE (CTS) Do not linkify text with RLO/LRO characters. am: 75e3cec289 -s ours am: 8113ea53de -s ours am: 197ec55961 -s ours am: 7427ce1582 -s ours am: fb9837ed24 -s ours am: 321ceeedb9 -s ours am skip reason: subject contains skip directive