merge 38100 42156 quit