fix channel 0 exit handling
merge bug25632 into stable
merge stable into default