Merge "Update code and add a way to benchmark traces."