merge 37603 37618 quit