Merge "Fix NPE in dump and add additional dump data"