Fix bottom of zone determination.

Merged Mark Andrews requested to merge michal-befix-squashed-v9_12 into v9_12

Merge request reports