BZ-13267 button state
Merge branch 'competitive-estimates' into release-candidate