merge 61574 61343 quit