Combine RequestBody delegate, source state to fix hang

Combine RequestBody delegate, source state to fix hang #2142