merge 42858 42740 quit