Merge "Prevent possible divide by 0 Bug #7307304" into jb-mr1-dev