merge 30993 37309 quit