merge 39646 39648 quit