merge 59489 57292 quit