Merge "Return total footprint, not high water mark."