BZ-11716: merge from ecm-estimator branch