Merge changes from topic "am-2a277b60e7f84401872ca9a832079778"

* changes:
  [automerger skipped] Merge "DO NOT MERGE: WM: Call Transaction#sanitize" into sc-v2-dev am: 0d84110c am: f96ede47 -s ours am: bfe57172 -s ours am: b5da4fba -s ours am: 319002d7 -s ours
  [automerger skipped] DO NOT MERGE: WM: Call Transaction#sanitize am: 20303e05 am: faac19df -s ours am: f1bf2743 -s ours am: 67ecf2be -s ours am: 54829b68 -s ours