Merge "Ensure that the port number and TXID are properly randomized." into jb-dev