Updates to trace file save branch to latest