merge 35858 36402 quit