merge 45266 41484 quit