Merge branch 'feature/test-labels' into 'master'

@timo.koch has a dire need for this on the release branch and I do not see why we shouldnt allow it.