am 21ff8c9c: am 1460c8ca: Merge "Prevent possible divide by 0 Bug #7307304" into jb-mr1-dev

* commit '21ff8c9cf22b38ad577d7eb01088cb49274cb22d':
  Prevent possible divide by 0 Bug #7307304