Merge "Improved dumpstate logging." into nyc-dev