dynamic labeling fixes #729
Merge branch 'logcleanup'