Added Tracking number and StampTxID to the logs.
Merge origin/master