Fix label height 'master' merge

This is a `master` merge for branch 'fix-label-height'. Should be clean to marge into master now.