merge 58650 60821 quit