Merge "Fixed the bug in forwarder that prevented ConnectionHandler threads from exiting."