Bug #282
Merge remote-tracking branch 'origin/pr/283'
Cleanup label names to support multiple charts