Further improvements to aggregate ground measuring
Small merge