excluded 0 values from calculation of aggregate statistics
(cherry picked from commit dd6c868)