Add a few missing labels
Merge branch 'master' into 1.9.x