merge UX BZ-12957 typesetting edits with create-estimates