merge 40981 41429 quit