better reporting whether the response was sent out completely
fix test
Merge branch 'R_2_0'