Merge changes from topic "am-bcb09242-ce3f-453e-a1ab-496ff9dcb274" into nyc-dev

* changes:
  [automerger] Add check preventing div0 issue am: 27e47ce3c3 am: 357017a262 am: fef8617324 am: a7d57f7a14
  [automerger] Add check preventing div0 issue am: 27e47ce3c3 am: 357017a262 am: fef8617324
  [automerger] Add check preventing div0 issue am: 27e47ce3c3 am: 357017a262
  [automerger] Add check preventing div0 issue am: 27e47ce3c3
  Add check preventing div0 issue