Pull state reporting changes into 1606_ox branch

Where is there commented-out code at?