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

* changes:
  [automerger] Add check preventing div0 issue am: 27e47ce3 am: 357017a2 am: fef86173 am: a7d57f7a am: 19d80c34
  [automerger] Add check preventing div0 issue am: 27e47ce3 am: 357017a2 am: fef86173 am: a7d57f7a
  [automerger] Add check preventing div0 issue am: 27e47ce3 am: 357017a2 am: fef86173
  [automerger] Add check preventing div0 issue am: 27e47ce3 am: 357017a2
  [automerger] Add check preventing div0 issue am: 27e47ce3
  Add check preventing div0 issue