Add labels to dumps
Remove unrelated code
Merge branch '1.0.0-labels' into 1.0.0-alanross