BZ-10458: Changes to retrieve the right estimate from the list
Merge branch 'master' of https://github.com/NoesisEnergy/bootstrap