BZ-12231: merge master chnages in estimates