BZ-12920 Estimate is malformed or empty
Merge branch 'Sprint74-DV' into release-candidate