Patch estimatesummary

Merge Estimate updates and the 1.7.1 updates to the 1.8 DEV branch