merge 58086 61964 quit