BZ-12958 corrected typos
Merge branch 'competitive-estimates' into integration