merge 39266 39208 quit