Merge changes from topic "am-0faa2c83-9779-430a-b81c-34246f31544a" into oc-dev

* changes:
  [automerger] Don't use Address after it was deleted am: 95b999f9 am: e4639faa am: 567ccaf4 am: c740a6b9 skipped: 21c06cb0
  [automerger] Don't use Address after it was deleted am: 95b999f9 am: e4639faa am: 567ccaf4 am: c740a6b9
  [automerger] Don't use Address after it was deleted am: 95b999f9 am: e4639faa am: 567ccaf4
  [automerger] Don't use Address after it was deleted am: 95b999f9 am: e4639faa
  [automerger] Don't use Address after it was deleted am: 95b999f9
  Don't use Address after it was deleted