Merge branch 'estimate-word-templates' into release-candidate
Merge remote-tracking branch 'origin/production'

* origin/production:
  new function to srtingify charts
BZ-13105 fixed query util
Merge branch 'competitive-estimates' into integration