BZ-9588 - changes to follow node
BZ-9998: markup for estimator