Merge branch 'div-by-zero-fix-2.7' into 2.x

5 jobs for 2.x
in 1 minute and 45 seconds and was queued for 3 seconds
latest