Merge "Dump different fields in imgdiag" into nyc-dev