Merge pull request #6737 from MrPetovan/bug/6630-fix-empty-label-profile