Pull state reporting changes into 1606_ox branch