BZ-11718 bug fixing
Merge branch 'ecmestimator' of https://github.com/NoesisEnergy/bootstrap into ecmestimator