Account for label in height requests
Merge remote-tracking branch 'origin/master'