merge 38735 40583 quit