Merge pull request #4947 from commodo/tcpreplay-update