Merge branch 'cherry-pick-d7168eec' into 'master'

this gives a more honest version of 'no division'

See merge request !3
4 jobs for master in 2 minutes and 36 seconds (queued for 4 seconds)