Use manual delivery flow control
merge bug26330 into default