BZ-12871: Refactoring based on changes to neGoogleAPI
Merge branch 'estimate-word-templates' into integration