Pervent bin shift by one if underflows are included.

(cherry picked from commit 92742b73aa743ffc6658e0ed42a691c7e42c3907)