BZ-9998: markup changes for estimator
BZ-9998: markup changes for estimator