Merge pull request #12641 from mfb/reply-forwarding