merge 36811 36812 quit