Pull state reporting changes into 1606_ox branch

Now that we have tracing available, let's make this log.Tracef