[HFIX] Fix division 0

Merged diego.barreto requested to merge HFIX into 12.0

Merge request reports