Standard display limit for labels
Fix conflicts after merging MH-1049 to dev