merge 37244 38047 quit