Merge pull request #7823 from newnon/v3_Label_fix

Label performance problem
[