BZ-12994 fixing circular dependencies
Merge branch 'estimate-word-templates' of https://github.com/NoesisEnergy/bootstrap into estimate-word-templates