merge 48534 30767 quit