merge 34276 37164 quit