merge 47090 46871 quit