BZ-11716: Changes to match both estimator