merge 41702 48005 quit